From 631205ddc7a443ffaa4d1ef71cc3c0d973017c2b Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 20 Jul 2000 05:40:49 +0000 Subject: [PATCH] Fix C++ comment. 2000-07-19 Tor Lillqvist * gtk/gtksignal.c: Fix C++ comment. * gtk/gtkimmulticontext.c * gtk/gtktextbtree.c: Remove gccisms: Don't use __FUNCTION__, don't return value from void functions. * gtk/gtk.def: Add gtk_rc_style_unref. --- ChangeLog | 10 ++++++++++ ChangeLog.pre-2-0 | 10 ++++++++++ ChangeLog.pre-2-10 | 10 ++++++++++ ChangeLog.pre-2-2 | 10 ++++++++++ ChangeLog.pre-2-4 | 10 ++++++++++ ChangeLog.pre-2-6 | 10 ++++++++++ ChangeLog.pre-2-8 | 10 ++++++++++ gtk/gtk.def | 1 + gtk/gtkimmulticontext.c | 4 ++-- gtk/gtksignal.c | 2 +- gtk/gtktextbtree.c | 10 +++++----- 11 files changed, 79 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index f7e61ef416..5ce13a710e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2000-07-19 Tor Lillqvist + + * gtk/gtksignal.c: Fix C++ comment. + + * gtk/gtkimmulticontext.c + * gtk/gtktextbtree.c: Remove gccisms: Don't use __FUNCTION__, + don't return value from void functions. + + * gtk/gtk.def: Add gtk_rc_style_unref. + 2000-07-19 Sebastian Wilhelmi * gdk-pixbuf/gdk-pixbuf.h, gtk/gtkhsv.h, gtk/gtktextbtree.h, diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index f7e61ef416..5ce13a710e 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,13 @@ +2000-07-19 Tor Lillqvist + + * gtk/gtksignal.c: Fix C++ comment. + + * gtk/gtkimmulticontext.c + * gtk/gtktextbtree.c: Remove gccisms: Don't use __FUNCTION__, + don't return value from void functions. + + * gtk/gtk.def: Add gtk_rc_style_unref. + 2000-07-19 Sebastian Wilhelmi * gdk-pixbuf/gdk-pixbuf.h, gtk/gtkhsv.h, gtk/gtktextbtree.h, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f7e61ef416..5ce13a710e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +2000-07-19 Tor Lillqvist + + * gtk/gtksignal.c: Fix C++ comment. + + * gtk/gtkimmulticontext.c + * gtk/gtktextbtree.c: Remove gccisms: Don't use __FUNCTION__, + don't return value from void functions. + + * gtk/gtk.def: Add gtk_rc_style_unref. + 2000-07-19 Sebastian Wilhelmi * gdk-pixbuf/gdk-pixbuf.h, gtk/gtkhsv.h, gtk/gtktextbtree.h, diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index f7e61ef416..5ce13a710e 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,13 @@ +2000-07-19 Tor Lillqvist + + * gtk/gtksignal.c: Fix C++ comment. + + * gtk/gtkimmulticontext.c + * gtk/gtktextbtree.c: Remove gccisms: Don't use __FUNCTION__, + don't return value from void functions. + + * gtk/gtk.def: Add gtk_rc_style_unref. + 2000-07-19 Sebastian Wilhelmi * gdk-pixbuf/gdk-pixbuf.h, gtk/gtkhsv.h, gtk/gtktextbtree.h, diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index f7e61ef416..5ce13a710e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,13 @@ +2000-07-19 Tor Lillqvist + + * gtk/gtksignal.c: Fix C++ comment. + + * gtk/gtkimmulticontext.c + * gtk/gtktextbtree.c: Remove gccisms: Don't use __FUNCTION__, + don't return value from void functions. + + * gtk/gtk.def: Add gtk_rc_style_unref. + 2000-07-19 Sebastian Wilhelmi * gdk-pixbuf/gdk-pixbuf.h, gtk/gtkhsv.h, gtk/gtktextbtree.h, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f7e61ef416..5ce13a710e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,13 @@ +2000-07-19 Tor Lillqvist + + * gtk/gtksignal.c: Fix C++ comment. + + * gtk/gtkimmulticontext.c + * gtk/gtktextbtree.c: Remove gccisms: Don't use __FUNCTION__, + don't return value from void functions. + + * gtk/gtk.def: Add gtk_rc_style_unref. + 2000-07-19 Sebastian Wilhelmi * gdk-pixbuf/gdk-pixbuf.h, gtk/gtkhsv.h, gtk/gtktextbtree.h, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f7e61ef416..5ce13a710e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +2000-07-19 Tor Lillqvist + + * gtk/gtksignal.c: Fix C++ comment. + + * gtk/gtkimmulticontext.c + * gtk/gtktextbtree.c: Remove gccisms: Don't use __FUNCTION__, + don't return value from void functions. + + * gtk/gtk.def: Add gtk_rc_style_unref. + 2000-07-19 Sebastian Wilhelmi * gdk-pixbuf/gdk-pixbuf.h, gtk/gtkhsv.h, gtk/gtktextbtree.h, diff --git a/gtk/gtk.def b/gtk/gtk.def index 455adc02b6..f5ea0d165b 100755 --- a/gtk/gtk.def +++ b/gtk/gtk.def @@ -981,6 +981,7 @@ EXPORTS gtk_rc_set_image_loader gtk_rc_style_new gtk_rc_style_ref + gtk_rc_style_unref gtk_ruler_draw_pos gtk_ruler_draw_ticks gtk_ruler_get_type diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c index ddfd18e672..1208a83938 100644 --- a/gtk/gtkimmulticontext.c +++ b/gtk/gtkimmulticontext.c @@ -203,7 +203,7 @@ gtk_im_multicontext_focus_in (GtkIMContext *context) GtkIMContext *slave = gtk_im_multicontext_get_slave (multicontext); if (slave) - return gtk_im_context_focus_in (slave); + gtk_im_context_focus_in (slave); } static void @@ -213,7 +213,7 @@ gtk_im_multicontext_focus_out (GtkIMContext *context) GtkIMContext *slave = gtk_im_multicontext_get_slave (multicontext); if (slave) - return gtk_im_context_focus_out (slave); + gtk_im_context_focus_out (slave); } void diff --git a/gtk/gtksignal.c b/gtk/gtksignal.c index 47902f7175..292315e3d3 100644 --- a/gtk/gtksignal.c +++ b/gtk/gtksignal.c @@ -1994,7 +1994,7 @@ gtk_signal_collect_params (GtkArg *params, return_type = GTK_FUNDAMENTAL_TYPE (return_type); if (return_type != GTK_TYPE_NONE) { - if (return_type != 0) // FIXME: check for IS_PARAM + if (return_type != 0) /* FIXME: check for IS_PARAM */ { GTK_VALUE_POINTER (*params) = va_arg (var_args, gpointer); diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c index ee2afb1c31..8c2b3e00af 100644 --- a/gtk/gtktextbtree.c +++ b/gtk/gtktextbtree.c @@ -1375,8 +1375,8 @@ gtk_text_btree_get_view_size (GtkTextBTree *tree, g_return_if_fail(tree != NULL); g_return_if_fail(view_id != NULL); - return gtk_text_btree_node_get_size(tree->root_node, view_id, - width, height); + gtk_text_btree_node_get_size(tree->root_node, view_id, + width, height); } /* @@ -5925,8 +5925,8 @@ gtk_text_btree_node_check_consistency(GtkTextBTreeNode *node) } if (num_chars != node->num_chars) { - g_error("%s: mismatch in num_chars (%d %d)", - __FUNCTION__, num_chars, node->num_chars); + g_error("gtk_text_btree_node_check_consistency: mismatch in num_chars (%d %d)", + num_chars, node->num_chars); } for (summary = node->summary; summary != NULL; @@ -6134,7 +6134,7 @@ gtk_text_btree_check (GtkTextBTree *tree) } if (node->num_chars < 2) { - g_error("%s: less than 2 chars in tree", __FUNCTION__); + g_error("gtk_text_btree_check: less than 2 chars in tree"); } while (node->level > 0) { -- 2.30.2